Auto merge of #1160 - alexcrichton:update, r=alexcrichton
authorbors <bors@rust-lang.org>
Tue, 13 Jan 2015 22:14:44 +0000 (22:14 +0000)
committerbors <bors@rust-lang.org>
Tue, 13 Jan 2015 22:14:44 +0000 (22:14 +0000)

Trivial merge